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

Side by Side Diff: components/security_interstitials/core/controller_client.cc

Issue 2692953002: [Merge M57] Fix crash caused by middle clicking the privacy link in SSL interstitials (Closed)
Patch Set: Created 3 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 | « no previous file | 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/security_interstitials/core/controller_client.h" 5 #include "components/security_interstitials/core/controller_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "components/google/core/browser/google_util.h" 9 #include "components/google/core/browser/google_util.h"
10 #include "components/prefs/pref_service.h" 10 #include "components/prefs/pref_service.h"
11 #include "components/security_interstitials/core/metrics_helper.h" 11 #include "components/security_interstitials/core/metrics_helper.h"
12 #include "grit/components_strings.h" 12 #include "grit/components_strings.h"
13 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
14 #include "url/gurl.h" 14 #include "url/gurl.h"
15 15
16 namespace security_interstitials { 16 namespace security_interstitials {
17 17
18 const char kBoxChecked[] = "boxchecked"; 18 const char kBoxChecked[] = "boxchecked";
19 const char kDisplayCheckBox[] = "displaycheckbox"; 19 const char kDisplayCheckBox[] = "displaycheckbox";
20 const char kOptInLink[] = "optInLink"; 20 const char kOptInLink[] = "optInLink";
21 const char kPrivacyLinkHtml[] = 21 const char kPrivacyLinkHtml[] =
22 "<a id=\"privacy-link\" href=\"\" onclick=\"sendCommand(%d); " 22 "<a id=\"privacy-link\" href=\"#\" onclick=\"sendCommand(%d); "
23 "return false;\" onmousedown=\"return false;\">%s</a>"; 23 "return false;\" onmousedown=\"return false;\">%s</a>";
24 24
25 ControllerClient::ControllerClient( 25 ControllerClient::ControllerClient(
26 std::unique_ptr<MetricsHelper> metrics_helper) 26 std::unique_ptr<MetricsHelper> metrics_helper)
27 : metrics_helper_(std::move(metrics_helper)) {} 27 : metrics_helper_(std::move(metrics_helper)) {}
28 28
29 ControllerClient::~ControllerClient() {} 29 ControllerClient::~ControllerClient() {}
30 30
31 MetricsHelper* ControllerClient::metrics_helper() const { 31 MetricsHelper* ControllerClient::metrics_helper() const {
32 return metrics_helper_.get(); 32 return metrics_helper_.get();
(...skipping 18 matching lines...) Expand all
51 void ControllerClient::OpenExtendedReportingWhitepaper() { 51 void ControllerClient::OpenExtendedReportingWhitepaper() {
52 metrics_helper_->RecordUserInteraction(MetricsHelper::SHOW_WHITEPAPER); 52 metrics_helper_->RecordUserInteraction(MetricsHelper::SHOW_WHITEPAPER);
53 GURL whitepaper_url( 53 GURL whitepaper_url(
54 l10n_util::GetStringUTF8(IDS_SAFE_BROWSING_WHITEPAPER_URL)); 54 l10n_util::GetStringUTF8(IDS_SAFE_BROWSING_WHITEPAPER_URL));
55 whitepaper_url = google_util::AppendGoogleLocaleParam(whitepaper_url, 55 whitepaper_url = google_util::AppendGoogleLocaleParam(whitepaper_url,
56 GetApplicationLocale()); 56 GetApplicationLocale());
57 OpenUrlInCurrentTab(whitepaper_url); 57 OpenUrlInCurrentTab(whitepaper_url);
58 } 58 }
59 59
60 } // namespace security_interstitials 60 } // namespace security_interstitials
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698